From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Feb 2011 01:23:15 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~57
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=88b2b217f968d464ef619bb535d5ef57893fe205;p=emacs.git

Merge from mainline.
---

88b2b217f968d464ef619bb535d5ef57893fe205